Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

if $c:expr { Some($r:expr) } else { None } =>> $c.then(|| $r) #108090

Merged
merged 2 commits into from
Feb 16, 2023

Conversation

WaffleLapkin
Copy link
Member

@WaffleLapkin WaffleLapkin commented Feb 15, 2023

Resurrection of #108079

@rustbot
Copy link
Collaborator

rustbot commented Feb 15, 2023

r? @michaelwoerister

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Feb 15, 2023
@rustbot
Copy link
Collaborator

rustbot commented Feb 15, 2023

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@WaffleLapkin
Copy link
Member Author

r? @oli-obk
@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Feb 15, 2023

📌 Commit 2f2833cbde8c13ecb7a286175006298c3fd8e94d has been approved by oli-obk

It is now in the queue for this repository.

@rustbot rustbot assigned oli-obk and unassigned michaelwoerister Feb 15, 2023
@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 15, 2023
@bors
Copy link
Contributor

bors commented Feb 16, 2023

☔ The latest upstream changes (presumably #101841) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 16, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the if_not_now_then_when… branch from 2f2833c to 5bf6a46 Compare February 16, 2023 15:26
@WaffleLapkin
Copy link
Member Author

First 101841 got merge conflicts because of previous version of this being merged, then it had problems cause the rebase on master was conflicting with master not having the commits or something and now this PR has merge conflicts because 101841 got merged. What a story lol

@bors r=oli-obk rollup

@bors
Copy link
Contributor

bors commented Feb 16, 2023

📌 Commit 5bf6a46 has been approved by oli-obk

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 16, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 16, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#106347 (More accurate spans for arg removal suggestion)
 - rust-lang#108057 (Prevent some attributes from being merged with others on reexports)
 - rust-lang#108090 (`if $c:expr { Some($r:expr) } else { None }` =>> `$c.then(|| $r)`)
 - rust-lang#108092 (note issue for feature(packed_bundled_libs))
 - rust-lang#108099 (use chars instead of strings where applicable)
 - rust-lang#108115 (Do not ICE on unmet trait alias bounds)
 - rust-lang#108125 (Add new people to the compiletest review rotation)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 64a4f70 into rust-lang:master Feb 16, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants